diff --git a/sphinx/ext/autodoc/__init__.py b/sphinx/ext/autodoc/__init__.py
index e16ab8ce5..fc7d14e36 100644
--- a/sphinx/ext/autodoc/__init__.py
+++ b/sphinx/ext/autodoc/__init__.py
@@ -1591,8 +1591,11 @@ class ClassDocumenter(DocstringSignatureMixin, ModuleLevelDocumenter):  # type:
                                               self.config.autodoc_type_aliases)
 
                 parameters = list(overload.parameters.values())
-                overload = overload.replace(parameters=parameters[1:],
-                                            return_annotation=Parameter.empty)
+                if self.config.autodoc_typehints == 'description':
+                    overload = overload.replace(parameters=parameters[1:],
+                                                return_annotation=Parameter.empty)
+                else:
+                    overload = overload.replace(parameters=parameters[1:])
                 sig = stringify_signature(overload, **kwargs)
                 sigs.append(sig)
         else:
@@ -2228,7 +2231,10 @@ class MethodDocumenter(DocstringSignatureMixin, ClassLevelDocumenter):  # type:
                                               name=self.object_name):
                     parameters = list(overload.parameters.values())
                     overload = overload.replace(parameters=parameters[1:])
-                sig = stringify_signature(overload, **kwargs)
+                if self.config.autodoc_typehints != 'description':
+                    sig = stringify_signature(overload, **kwargs)
+                else:
+                    sig = stringify_signature(overload, show_return_annotation=False, **kwargs)
                 sigs.append(sig)
 
         return "\n".join(sigs)
diff --git a/tox.ini b/tox.ini
index 105a02597..90ada0821 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,7 +29,7 @@ setenv =
     PYTHONWARNINGS = all
     PYTEST_ADDOPTS = {env:PYTEST_ADDOPTS:} --color yes
 commands=
-    python -X dev -X warn_default_encoding -m pytest --durations 25 {posargs}
+    python -X dev -X warn_default_encoding -m pytest -rA --durations 25 {posargs}
 
 [testenv:du-latest]
 commands =
